Merge tag 'upstream/0.11.0' into debian/sid
authorLuca Bruno <lucab@debian.org>
Sun, 14 Aug 2016 21:41:59 +0000 (21:41 +0000)
committerLuca Bruno <lucab@debian.org>
Sun, 14 Aug 2016 21:41:59 +0000 (21:41 +0000)
Upstream version 0.11.0


Trivial merge